Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

529 #82

Closed
Closed

Conversation

themanyfaceddemon
Copy link
Contributor

Перенос AdventureTimeSS14/space_station#529

Conflicts:

Resources/Locale/ru-RU/ADT/Clothing/Belt/belt.ftl

Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml

no cl

@github-actions github-actions bot added Changes: Sprites Изменение спрайтов No C# Changes: Localization Изменение локализации labels Jul 1, 2024
Copy link
Contributor

github-actions bot commented Jul 1, 2024

RSI Diff Bot; head commit aa01d01 merging into ea86b19
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/ADT/Clothing/Belt/sheath_OCK.rsi

State Old New Status
equipped-BELT Added
sheath-sabre-equipped-BELT Added
sheath-sabre Added
sheath Added

@Schrodinger71 Schrodinger71 linked an issue Jul 1, 2024 that may be closed by this pull request
@1Stepka1 1Stepka1 marked this pull request as draft August 3, 2024 19:23
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Lonkuk
Copy link
Contributor

Lonkuk commented Aug 13, 2024

Уже сделано -> #214

@Lonkuk Lonkuk closed this Aug 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Изменение локализации Changes: Sprites Изменение спрайтов Merge Conflict No C#
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Сабельные ножны ЦентКом(529 PR)
4 participants